From f8191592c84ee63602f6dc9119744299dcb63654 Mon Sep 17 00:00:00 2001 From: Hans van Kranenburg Date: Wed, 20 Dec 2017 01:58:27 +0100 Subject: [PATCH] debian/patches: Use ab style filenames --- debian/patches/config-prefix.diff | 8 +++---- debian/patches/rerun-autogen.sh-stretch.patch | 16 ++++++------- debian/patches/tools-blktap2-prefix.diff | 12 +++++----- debian/patches/tools-console-prefix.diff | 4 ++-- debian/patches/tools-include-install.diff | 4 ++-- debian/patches/tools-libfsimage-abiname.diff | 4 ++-- debian/patches/tools-libfsimage-prefix.diff | 8 +++---- debian/patches/tools-libxc-abiname.diff | 4 ++-- debian/patches/tools-libxl-abiname.diff | 4 ++-- debian/patches/tools-libxl-prefix.diff | 4 ++-- debian/patches/tools-misc-prefix.diff | 4 ++-- debian/patches/tools-pygrub-prefix.diff | 12 +++++----- ...tools-pygrub-remove-static-solaris-support | 4 ++-- debian/patches/tools-python-prefix.diff | 4 ++-- debian/patches/tools-rpath.diff | 4 ++-- debian/patches/tools-xcutils-rpath.diff | 4 ++-- debian/patches/tools-xenmon-install.diff | 4 ++-- debian/patches/tools-xenmon-prefix.diff | 4 ++-- debian/patches/tools-xenpaging-prefix.diff | 4 ++-- debian/patches/tools-xenpmd-prefix.diff | 4 ++-- debian/patches/tools-xenstat-abiname.diff | 4 ++-- debian/patches/tools-xenstat-prefix.diff | 8 +++---- .../patches/tools-xenstore-compatibility.diff | 12 +++++----- debian/patches/tools-xenstore-prefix.diff | 8 +++---- debian/patches/tools-xentrace-prefix.diff | 4 ++-- ...stestsx86_emulator-pass--no-pie--fno.patch | 4 ++-- debian/patches/ubuntu-tools-libs-abiname.diff | 20 ++++++++-------- debian/patches/version.diff | 24 +++++++++---------- 28 files changed, 100 insertions(+), 100 deletions(-) diff --git a/debian/patches/config-prefix.diff b/debian/patches/config-prefix.diff index 922b617aa9..03711eec63 100644 --- a/debian/patches/config-prefix.diff +++ b/debian/patches/config-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: config-prefix.diff --- ---- xen-4.8.2+xsa243.orig/Config.mk -+++ xen-4.8.2+xsa243/Config.mk +--- a/Config.mk ++++ b/Config.mk @@ -82,7 +82,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib endif @@ -17,8 +17,8 @@ Patch-Name: config-prefix.diff # The above requires that prefix contains *no spaces*. This variable is here # to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug: # https://bugs.launchpad.net/ubuntu/+bug/362570 ---- xen-4.8.2+xsa243.orig/config/Paths.mk.in -+++ xen-4.8.2+xsa243/config/Paths.mk.in +--- a/config/Paths.mk.in ++++ b/config/Paths.mk.in @@ -13,6 +13,7 @@ # http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration diff --git a/debian/patches/rerun-autogen.sh-stretch.patch b/debian/patches/rerun-autogen.sh-stretch.patch index 34af69aaf6..19d17330d8 100644 --- a/debian/patches/rerun-autogen.sh-stretch.patch +++ b/debian/patches/rerun-autogen.sh-stretch.patch @@ -8,8 +8,8 @@ Signed-off-by: Ian Jackson --- ---- xen-4.8.2+xsa243.orig/configure -+++ xen-4.8.2+xsa243/configure +--- a/configure ++++ b/configure @@ -641,6 +641,7 @@ infodir docdir oldincludedir @@ -59,8 +59,8 @@ Signed-off-by: Ian Jackson --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] ---- xen-4.8.2+xsa243.orig/docs/configure -+++ xen-4.8.2+xsa243/docs/configure +--- a/docs/configure ++++ b/docs/configure @@ -632,6 +632,7 @@ infodir docdir oldincludedir @@ -110,8 +110,8 @@ Signed-off-by: Ian Jackson --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] ---- xen-4.8.2+xsa243.orig/stubdom/configure -+++ xen-4.8.2+xsa243/stubdom/configure +--- a/stubdom/configure ++++ b/stubdom/configure @@ -659,6 +659,7 @@ infodir docdir oldincludedir @@ -161,8 +161,8 @@ Signed-off-by: Ian Jackson --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] ---- xen-4.8.2+xsa243.orig/tools/configure -+++ xen-4.8.2+xsa243/tools/configure +--- a/tools/configure ++++ b/tools/configure @@ -767,6 +767,7 @@ infodir docdir oldincludedir diff --git a/debian/patches/tools-blktap2-prefix.diff b/debian/patches/tools-blktap2-prefix.diff index 9b1ae92c3c..fac2e87159 100644 --- a/debian/patches/tools-blktap2-prefix.diff +++ b/debian/patches/tools-blktap2-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-blktap2-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/blktap2/control/Makefile -+++ xen-4.8.2+xsa243/tools/blktap2/control/Makefile +--- a/tools/blktap2/control/Makefile ++++ b/tools/blktap2/control/Makefile @@ -1,10 +1,7 @@ XEN_ROOT := $(CURDIR)/../../../ include $(XEN_ROOT)/tools/Rules.mk @@ -67,8 +67,8 @@ Patch-Name: tools-blktap2-prefix.diff rm -f *~ distclean: clean ---- xen-4.8.2+xsa243.orig/tools/blktap2/vhd/Makefile -+++ xen-4.8.2+xsa243/tools/blktap2/vhd/Makefile +--- a/tools/blktap2/vhd/Makefile ++++ b/tools/blktap2/vhd/Makefile @@ -12,6 +12,7 @@ CFLAGS += -Werror CFLAGS += -Wno-unused CFLAGS += -I../include @@ -77,8 +77,8 @@ Patch-Name: tools-blktap2-prefix.diff ifeq ($(CONFIG_X86_64),y) CFLAGS += -fPIC ---- xen-4.8.2+xsa243.orig/tools/blktap2/vhd/lib/Makefile -+++ xen-4.8.2+xsa243/tools/blktap2/vhd/lib/Makefile +--- a/tools/blktap2/vhd/lib/Makefile ++++ b/tools/blktap2/vhd/lib/Makefile @@ -2,25 +2,19 @@ XEN_ROOT=$(CURDIR)/../../../.. BLKTAP_ROOT := ../.. include $(XEN_ROOT)/tools/Rules.mk diff --git a/debian/patches/tools-console-prefix.diff b/debian/patches/tools-console-prefix.diff index 7c5024809b..6736fff4d5 100644 --- a/debian/patches/tools-console-prefix.diff +++ b/debian/patches/tools-console-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-console-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/console/Makefile -+++ xen-4.8.2+xsa243/tools/console/Makefile +--- a/tools/console/Makefile ++++ b/tools/console/Makefile @@ -8,6 +8,7 @@ CFLAGS += $(CFLAGS_libxenstore) LDLIBS += $(LDLIBS_libxenctrl) LDLIBS += $(LDLIBS_libxenstore) diff --git a/debian/patches/tools-include-install.diff b/debian/patches/tools-include-install.diff index 7f773aa103..f19c066aa3 100644 --- a/debian/patches/tools-include-install.diff +++ b/debian/patches/tools-include-install.diff @@ -6,8 +6,8 @@ Patch-Name: tools-include-install.diff --- ---- xen-4.8.2+xsa243.orig/tools/include/Makefile -+++ xen-4.8.2+xsa243/tools/include/Makefile +--- a/tools/include/Makefile ++++ b/tools/include/Makefile @@ -14,7 +14,6 @@ xen-foreign: xen/.dir: @rm -rf xen diff --git a/debian/patches/tools-libfsimage-abiname.diff b/debian/patches/tools-libfsimage-abiname.diff index b26bbfda71..82715e312e 100644 --- a/debian/patches/tools-libfsimage-abiname.diff +++ b/debian/patches/tools-libfsimage-abiname.diff @@ -6,8 +6,8 @@ Patch-Name: tools-libfsimage-abiname.diff --- ---- xen-4.8.2+xsa243.orig/tools/libfsimage/common/Makefile -+++ xen-4.8.2+xsa243/tools/libfsimage/common/Makefile +--- a/tools/libfsimage/common/Makefile ++++ b/tools/libfsimage/common/Makefile @@ -1,9 +1,6 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/debian/patches/tools-libfsimage-prefix.diff b/debian/patches/tools-libfsimage-prefix.diff index 9360e97f58..ee15d59ac0 100644 --- a/debian/patches/tools-libfsimage-prefix.diff +++ b/debian/patches/tools-libfsimage-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-libfsimage-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/libfsimage/Rules.mk -+++ xen-4.8.2+xsa243/tools/libfsimage/Rules.mk +--- a/tools/libfsimage/Rules.mk ++++ b/tools/libfsimage/Rules.mk @@ -3,10 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" CFLAGS += -Werror -D_GNU_SOURCE @@ -21,8 +21,8 @@ Patch-Name: tools-libfsimage-prefix.diff FSLIB = fsimage.so ---- xen-4.8.2+xsa243.orig/tools/libfsimage/common/Makefile -+++ xen-4.8.2+xsa243/tools/libfsimage/common/Makefile +--- a/tools/libfsimage/common/Makefile ++++ b/tools/libfsimage/common/Makefile @@ -1,6 +1,8 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/debian/patches/tools-libxc-abiname.diff b/debian/patches/tools-libxc-abiname.diff index 5a5299df01..5a5a8fa7e1 100644 --- a/debian/patches/tools-libxc-abiname.diff +++ b/debian/patches/tools-libxc-abiname.diff @@ -6,8 +6,8 @@ Patch-Name: tools-libxc-abiname.diff --- ---- xen-4.8.2+xsa243.orig/tools/libxc/Makefile -+++ xen-4.8.2+xsa243/tools/libxc/Makefile +--- a/tools/libxc/Makefile ++++ b/tools/libxc/Makefile @@ -1,9 +1,6 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk diff --git a/debian/patches/tools-libxl-abiname.diff b/debian/patches/tools-libxl-abiname.diff index ff4289a3b1..2aeda4e331 100644 --- a/debian/patches/tools-libxl-abiname.diff +++ b/debian/patches/tools-libxl-abiname.diff @@ -6,8 +6,8 @@ Patch-Name: tools-libxl-abiname.diff --- ---- xen-4.8.2+xsa243.orig/tools/libxl/Makefile -+++ xen-4.8.2+xsa243/tools/libxl/Makefile +--- a/tools/libxl/Makefile ++++ b/tools/libxl/Makefile @@ -5,12 +5,6 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk diff --git a/debian/patches/tools-libxl-prefix.diff b/debian/patches/tools-libxl-prefix.diff index cecdb412a6..a9fe903257 100644 --- a/debian/patches/tools-libxl-prefix.diff +++ b/debian/patches/tools-libxl-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-libxl-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/libxl/Makefile -+++ xen-4.8.2+xsa243/tools/libxl/Makefile +--- a/tools/libxl/Makefile ++++ b/tools/libxl/Makefile @@ -12,6 +12,8 @@ CFLAGS += -I. -fPIC ifeq ($(CONFIG_Linux),y) LIBUUID_LIBS += -luuid diff --git a/debian/patches/tools-misc-prefix.diff b/debian/patches/tools-misc-prefix.diff index 33c73ef7fd..0ae3358f91 100644 --- a/debian/patches/tools-misc-prefix.diff +++ b/debian/patches/tools-misc-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-misc-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/misc/Makefile -+++ xen-4.8.2+xsa243/tools/misc/Makefile +--- a/tools/misc/Makefile ++++ b/tools/misc/Makefile @@ -54,12 +54,8 @@ all build: $(TARGETS_BUILD) .PHONY: install diff --git a/debian/patches/tools-pygrub-prefix.diff b/debian/patches/tools-pygrub-prefix.diff index f630378b4c..3b05289be6 100644 --- a/debian/patches/tools-pygrub-prefix.diff +++ b/debian/patches/tools-pygrub-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-pygrub-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/pygrub/Makefile -+++ xen-4.8.2+xsa243/tools/pygrub/Makefile +--- a/tools/pygrub/Makefile ++++ b/tools/pygrub/Makefile @@ -16,11 +16,6 @@ install: all CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \ setup.py install $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \ @@ -20,8 +20,8 @@ Patch-Name: tools-pygrub-prefix.diff .PHONY: clean clean: ---- xen-4.8.2+xsa243.orig/tools/pygrub/setup.py -+++ xen-4.8.2+xsa243/tools/pygrub/setup.py +--- a/tools/pygrub/setup.py ++++ b/tools/pygrub/setup.py @@ -4,11 +4,13 @@ import os import sys @@ -36,8 +36,8 @@ Patch-Name: tools-pygrub-prefix.diff include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ], library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ], libraries = ["fsimage"], ---- xen-4.8.2+xsa243.orig/tools/pygrub/src/pygrub -+++ xen-4.8.2+xsa243/tools/pygrub/src/pygrub +--- a/tools/pygrub/src/pygrub ++++ b/tools/pygrub/src/pygrub @@ -21,6 +21,8 @@ import xen.lowlevel.xc import curses, _curses, curses.wrapper, curses.textpad, curses.ascii import getopt diff --git a/debian/patches/tools-pygrub-remove-static-solaris-support b/debian/patches/tools-pygrub-remove-static-solaris-support index cf828f997e..23e74a272d 100644 --- a/debian/patches/tools-pygrub-remove-static-solaris-support +++ b/debian/patches/tools-pygrub-remove-static-solaris-support @@ -6,8 +6,8 @@ Patch-Name: tools-pygrub-remove-static-solaris-support --- ---- xen-4.8.2+xsa243.orig/tools/pygrub/src/pygrub -+++ xen-4.8.2+xsa243/tools/pygrub/src/pygrub +--- a/tools/pygrub/src/pygrub ++++ b/tools/pygrub/src/pygrub @@ -16,7 +16,6 @@ import os, sys, string, struct, tempfile import copy import logging diff --git a/debian/patches/tools-python-prefix.diff b/debian/patches/tools-python-prefix.diff index b5c2bdbf54..48375b7a50 100644 --- a/debian/patches/tools-python-prefix.diff +++ b/debian/patches/tools-python-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-python-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/python/setup.py -+++ xen-4.8.2+xsa243/tools/python/setup.py +--- a/tools/python/setup.py ++++ b/tools/python/setup.py @@ -5,6 +5,7 @@ import os, sys XEN_ROOT = "../.." diff --git a/debian/patches/tools-rpath.diff b/debian/patches/tools-rpath.diff index 868c28daa5..f6ecd2c108 100644 --- a/debian/patches/tools-rpath.diff +++ b/debian/patches/tools-rpath.diff @@ -6,8 +6,8 @@ Patch-Name: tools-rpath.diff --- ---- xen-4.8.2+xsa243.orig/tools/Rules.mk -+++ xen-4.8.2+xsa243/tools/Rules.mk +--- a/tools/Rules.mk ++++ b/tools/Rules.mk @@ -9,6 +9,8 @@ include $(XEN_ROOT)/Config.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install diff --git a/debian/patches/tools-xcutils-rpath.diff b/debian/patches/tools-xcutils-rpath.diff index 77d927e24f..6e7db6a40b 100644 --- a/debian/patches/tools-xcutils-rpath.diff +++ b/debian/patches/tools-xcutils-rpath.diff @@ -6,8 +6,8 @@ Patch-Name: tools-xcutils-rpath.diff --- ---- xen-4.8.2+xsa243.orig/tools/xcutils/Makefile -+++ xen-4.8.2+xsa243/tools/xcutils/Makefile +--- a/tools/xcutils/Makefile ++++ b/tools/xcutils/Makefile @@ -19,6 +19,8 @@ CFLAGS += -Werror CFLAGS_readnotes.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -I$(XEN_ROOT)/tools/libxc $(CFLAGS_libxencall) CFLAGS_lsevtchn.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) diff --git a/debian/patches/tools-xenmon-install.diff b/debian/patches/tools-xenmon-install.diff index b0d2fc4113..e9120bfd86 100644 --- a/debian/patches/tools-xenmon-install.diff +++ b/debian/patches/tools-xenmon-install.diff @@ -6,8 +6,8 @@ Patch-Name: tools-xenmon-install.diff --- ---- xen-4.8.2+xsa243.orig/tools/xenmon/Makefile -+++ xen-4.8.2+xsa243/tools/xenmon/Makefile +--- a/tools/xenmon/Makefile ++++ b/tools/xenmon/Makefile @@ -13,6 +13,10 @@ XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk diff --git a/debian/patches/tools-xenmon-prefix.diff b/debian/patches/tools-xenmon-prefix.diff index aebfc62632..6579a72e16 100644 --- a/debian/patches/tools-xenmon-prefix.diff +++ b/debian/patches/tools-xenmon-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-xenmon-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/xenmon/Makefile -+++ xen-4.8.2+xsa243/tools/xenmon/Makefile +--- a/tools/xenmon/Makefile ++++ b/tools/xenmon/Makefile @@ -18,6 +18,7 @@ CFLAGS += $(CFLAGS_libxenevtchn) CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenctrl) diff --git a/debian/patches/tools-xenpaging-prefix.diff b/debian/patches/tools-xenpaging-prefix.diff index 7d42419fc1..7cdd3ae978 100644 --- a/debian/patches/tools-xenpaging-prefix.diff +++ b/debian/patches/tools-xenpaging-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-xenpaging-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/xenpaging/Makefile -+++ xen-4.8.2+xsa243/tools/xenpaging/Makefile +--- a/tools/xenpaging/Makefile ++++ b/tools/xenpaging/Makefile @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk # xenpaging.c and file_ops.c incorrectly use libxc internals CFLAGS += $(CFLAGS_libxentoollog) $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS) -I$(XEN_ROOT)/tools/libxc $(CFLAGS_libxencall) diff --git a/debian/patches/tools-xenpmd-prefix.diff b/debian/patches/tools-xenpmd-prefix.diff index eb32108507..62219358ef 100644 --- a/debian/patches/tools-xenpmd-prefix.diff +++ b/debian/patches/tools-xenpmd-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-xenpmd-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/xenpmd/Makefile -+++ xen-4.8.2+xsa243/tools/xenpmd/Makefile +--- a/tools/xenpmd/Makefile ++++ b/tools/xenpmd/Makefile @@ -11,8 +11,8 @@ all: xenpmd .PHONY: install diff --git a/debian/patches/tools-xenstat-abiname.diff b/debian/patches/tools-xenstat-abiname.diff index c19bde434c..6b46a1f8f8 100644 --- a/debian/patches/tools-xenstat-abiname.diff +++ b/debian/patches/tools-xenstat-abiname.diff @@ -6,8 +6,8 @@ Patch-Name: tools-xenstat-abiname.diff --- ---- xen-4.8.2+xsa243.orig/tools/xenstat/libxenstat/Makefile -+++ xen-4.8.2+xsa243/tools/xenstat/libxenstat/Makefile +--- a/tools/xenstat/libxenstat/Makefile ++++ b/tools/xenstat/libxenstat/Makefile @@ -18,18 +18,14 @@ include $(XEN_ROOT)/tools/Rules.mk LDCONFIG=ldconfig MAKE_LINK=ln -sf diff --git a/debian/patches/tools-xenstat-prefix.diff b/debian/patches/tools-xenstat-prefix.diff index 5921262c0f..f1e2478ca1 100644 --- a/debian/patches/tools-xenstat-prefix.diff +++ b/debian/patches/tools-xenstat-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-xenstat-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/xenstat/libxenstat/Makefile -+++ xen-4.8.2+xsa243/tools/xenstat/libxenstat/Makefile +--- a/tools/xenstat/libxenstat/Makefile ++++ b/tools/xenstat/libxenstat/Makefile @@ -20,7 +20,7 @@ MAKE_LINK=ln -sf LIB=src/libxenstat.a @@ -30,8 +30,8 @@ Patch-Name: tools-xenstat-prefix.diff PYLIB=bindings/swig/python/_xenstat.so PYMOD=bindings/swig/python/xenstat.py ---- xen-4.8.2+xsa243.orig/tools/xenstat/xentop/Makefile -+++ xen-4.8.2+xsa243/tools/xenstat/xentop/Makefile +--- a/tools/xenstat/xentop/Makefile ++++ b/tools/xenstat/xentop/Makefile @@ -19,7 +19,9 @@ all install xentop: else diff --git a/debian/patches/tools-xenstore-compatibility.diff b/debian/patches/tools-xenstore-compatibility.diff index 4c4df8bb07..06ef66ec6b 100644 --- a/debian/patches/tools-xenstore-compatibility.diff +++ b/debian/patches/tools-xenstore-compatibility.diff @@ -6,8 +6,8 @@ Patch-Name: tools-xenstore-compatibility.diff --- ---- xen-4.8.2+xsa243.orig/tools/xenstore/include/xenstore.h -+++ xen-4.8.2+xsa243/tools/xenstore/include/xenstore.h +--- a/tools/xenstore/include/xenstore.h ++++ b/tools/xenstore/include/xenstore.h @@ -25,6 +25,7 @@ #define XS_OPEN_READONLY 1UL<<0 @@ -16,8 +16,8 @@ Patch-Name: tools-xenstore-compatibility.diff /* * Setting XS_UNWATCH_FILTER arranges that after xs_unwatch, no ---- xen-4.8.2+xsa243.orig/tools/xenstore/xenstore_client.c -+++ xen-4.8.2+xsa243/tools/xenstore/xenstore_client.c +--- a/tools/xenstore/xenstore_client.c ++++ b/tools/xenstore/xenstore_client.c @@ -636,7 +636,7 @@ main(int argc, char **argv) max_width = ws.ws_col - 2; } @@ -27,8 +27,8 @@ Patch-Name: tools-xenstore-compatibility.diff if (xsh == NULL) err(1, "xs_open"); again: ---- xen-4.8.2+xsa243.orig/tools/xenstore/xs.c -+++ xen-4.8.2+xsa243/tools/xenstore/xs.c +--- a/tools/xenstore/xs.c ++++ b/tools/xenstore/xs.c @@ -281,17 +281,19 @@ struct xs_handle *xs_daemon_open_readonl struct xs_handle *xs_domain_open(void) diff --git a/debian/patches/tools-xenstore-prefix.diff b/debian/patches/tools-xenstore-prefix.diff index 18d6fbf424..977c2f2576 100644 --- a/debian/patches/tools-xenstore-prefix.diff +++ b/debian/patches/tools-xenstore-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-xenstore-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/helpers/Makefile -+++ xen-4.8.2+xsa243/tools/helpers/Makefile +--- a/tools/helpers/Makefile ++++ b/tools/helpers/Makefile @@ -31,7 +31,7 @@ xen-init-dom0: $(XEN_INIT_DOM0_OBJS) $(INIT_XENSTORE_DOMAIN_OBJS): _paths.h @@ -17,8 +17,8 @@ Patch-Name: tools-xenstore-prefix.diff .PHONY: install install: all ---- xen-4.8.2+xsa243.orig/tools/xenstore/Makefile -+++ xen-4.8.2+xsa243/tools/xenstore/Makefile +--- a/tools/xenstore/Makefile ++++ b/tools/xenstore/Makefile @@ -20,6 +20,8 @@ LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_L CFLAGS += $(CFLAGS-y) LDFLAGS += $(LDFLAGS-y) diff --git a/debian/patches/tools-xentrace-prefix.diff b/debian/patches/tools-xentrace-prefix.diff index 0148121545..fc8261776e 100644 --- a/debian/patches/tools-xentrace-prefix.diff +++ b/debian/patches/tools-xentrace-prefix.diff @@ -6,8 +6,8 @@ Patch-Name: tools-xentrace-prefix.diff --- ---- xen-4.8.2+xsa243.orig/tools/xentrace/Makefile -+++ xen-4.8.2+xsa243/tools/xentrace/Makefile +--- a/tools/xentrace/Makefile ++++ b/tools/xentrace/Makefile @@ -8,6 +8,7 @@ CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenevtchn) LDLIBS += $(LDLIBS_libxenctrl) diff --git a/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch b/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch index 7d62509d30..d1e2bae5bc 100644 --- a/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch +++ b/debian/patches/toolstestsx86_emulator-pass--no-pie--fno.patch @@ -32,8 +32,8 @@ Signed-off-by: Ian Jackson --- ---- xen-4.8.2+xsa243.orig/tools/tests/x86_emulator/Makefile -+++ xen-4.8.2+xsa243/tools/tests/x86_emulator/Makefile +--- a/tools/tests/x86_emulator/Makefile ++++ b/tools/tests/x86_emulator/Makefile @@ -45,6 +45,10 @@ x86_emulate/x86_emulate.c x86_emulate/x8 HOSTCFLAGS += $(CFLAGS_xeninclude) diff --git a/debian/patches/ubuntu-tools-libs-abiname.diff b/debian/patches/ubuntu-tools-libs-abiname.diff index de8bd3cf73..6094f1ee17 100644 --- a/debian/patches/ubuntu-tools-libs-abiname.diff +++ b/debian/patches/ubuntu-tools-libs-abiname.diff @@ -5,8 +5,8 @@ Subject: ubuntu-tools-libs-abiname --- ---- xen-4.8.2+xsa243.orig/tools/libs/call/Makefile -+++ xen-4.8.2+xsa243/tools/libs/call/Makefile +--- a/tools/libs/call/Makefile ++++ b/tools/libs/call/Makefile @@ -39,22 +39,22 @@ headers.chk: $(wildcard include/*.h) libxencall.a: $(LIB_OBJS) $(AR) rc $@ $^ @@ -46,8 +46,8 @@ Subject: ubuntu-tools-libs-abiname rm -f headers.chk .PHONY: distclean ---- xen-4.8.2+xsa243.orig/tools/libs/evtchn/Makefile -+++ xen-4.8.2+xsa243/tools/libs/evtchn/Makefile +--- a/tools/libs/evtchn/Makefile ++++ b/tools/libs/evtchn/Makefile @@ -39,22 +39,22 @@ headers.chk: $(wildcard include/*.h) libxenevtchn.a: $(LIB_OBJS) $(AR) rc $@ $^ @@ -87,8 +87,8 @@ Subject: ubuntu-tools-libs-abiname rm -f headers.chk .PHONY: distclean ---- xen-4.8.2+xsa243.orig/tools/libs/foreignmemory/Makefile -+++ xen-4.8.2+xsa243/tools/libs/foreignmemory/Makefile +--- a/tools/libs/foreignmemory/Makefile ++++ b/tools/libs/foreignmemory/Makefile @@ -39,22 +39,22 @@ headers.chk: $(wildcard include/*.h) libxenforeignmemory.a: $(LIB_OBJS) $(AR) rc $@ $^ @@ -128,8 +128,8 @@ Subject: ubuntu-tools-libs-abiname rm -f headers.chk .PHONY: distclean ---- xen-4.8.2+xsa243.orig/tools/libs/gnttab/Makefile -+++ xen-4.8.2+xsa243/tools/libs/gnttab/Makefile +--- a/tools/libs/gnttab/Makefile ++++ b/tools/libs/gnttab/Makefile @@ -41,22 +41,22 @@ headers.chk: $(wildcard include/*.h) libxengnttab.a: $(LIB_OBJS) $(AR) rc $@ $^ @@ -169,8 +169,8 @@ Subject: ubuntu-tools-libs-abiname rm -f headers.chk .PHONY: distclean ---- xen-4.8.2+xsa243.orig/tools/libs/toollog/Makefile -+++ xen-4.8.2+xsa243/tools/libs/toollog/Makefile +--- a/tools/libs/toollog/Makefile ++++ b/tools/libs/toollog/Makefile @@ -34,22 +34,22 @@ headers.chk: $(wildcard include/*.h) libxentoollog.a: $(LIB_OBJS) $(AR) rc $@ $^ diff --git a/debian/patches/version.diff b/debian/patches/version.diff index f6029ddd89..7295d9def1 100644 --- a/debian/patches/version.diff +++ b/debian/patches/version.diff @@ -6,8 +6,8 @@ Patch-Name: version.diff --- ---- xen-4.8.2+xsa243.orig/xen/Makefile -+++ xen-4.8.2+xsa243/xen/Makefile +--- a/xen/Makefile ++++ b/xen/Makefile @@ -160,7 +160,7 @@ delete-unfresh-files: @mv -f $@.tmp $@ @@ -31,8 +31,8 @@ Patch-Name: version.diff @mv -f $@.new $@ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s ---- xen-4.8.2+xsa243.orig/xen/common/kernel.c -+++ xen-4.8.2+xsa243/xen/common/kernel.c +--- a/xen/common/kernel.c ++++ b/xen/common/kernel.c @@ -252,8 +252,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL memset(&info, 0, sizeof(info)); @@ -44,8 +44,8 @@ Patch-Name: version.diff safe_strcpy(info.compile_date, deny ? xen_deny() : xen_compile_date()); if ( copy_to_guest(arg, &info, 1) ) return -EFAULT; ---- xen-4.8.2+xsa243.orig/xen/common/version.c -+++ xen-4.8.2+xsa243/xen/common/version.c +--- a/xen/common/version.c ++++ b/xen/common/version.c @@ -20,19 +20,24 @@ const char *xen_compile_time(void) return XEN_COMPILE_TIME; } @@ -89,8 +89,8 @@ Patch-Name: version.diff const char *xen_deny(void) { return ""; ---- xen-4.8.2+xsa243.orig/xen/drivers/char/console.c -+++ xen-4.8.2+xsa243/xen/drivers/char/console.c +--- a/xen/drivers/char/console.c ++++ b/xen/drivers/char/console.c @@ -732,14 +732,11 @@ void __init console_init_preirq(void) serial_set_rx_handler(sercon_handle, serial_rx); @@ -109,8 +109,8 @@ Patch-Name: version.diff if ( opt_sync_console ) { ---- xen-4.8.2+xsa243.orig/xen/include/xen/compile.h.in -+++ xen-4.8.2+xsa243/xen/include/xen/compile.h.in +--- a/xen/include/xen/compile.h.in ++++ b/xen/include/xen/compile.h.in @@ -1,8 +1,9 @@ #define XEN_COMPILE_DATE "@@date@@" #define XEN_COMPILE_TIME "@@time@@" @@ -129,8 +129,8 @@ Patch-Name: version.diff #define XEN_CHANGESET "@@changeset@@" -#define XEN_BANNER \ ---- xen-4.8.2+xsa243.orig/xen/include/xen/version.h -+++ xen-4.8.2+xsa243/xen/include/xen/version.h +--- a/xen/include/xen/version.h ++++ b/xen/include/xen/version.h @@ -6,9 +6,10 @@ const char *xen_compile_date(void); -- 2.30.2